MSVC Builds: Fix gengir Projects

Like the install projects that were fixed few days ago, the gengir projects
did not have info on the intermediate and output directories as a result of
the split up of the property sheets.  Fix this by including the appropriate
property sheet in the gtk-gengir property sheet so that we can avoid
confusing messages from Visual Studio on whether to reload the gengir
project as it was modified, at least on 2008.

diff --git a/build/win32/vs10/gtk-gengir.props b/build/win32/vs10/gtk-gengir.props
index f16e3457792e751d07c7c9e996697961aa1ed89c..e271a1781ea92dc0e39b194c24f79a6fcabfb606 100644 (file)
--- a/build/win32/vs10/gtk-gengir.props
+++ b/build/win32/vs10/gtk-gengir.props
@@ -2,6 +2,7 @@
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ImportGroup Label="PropertySheets">\r
     <Import Project="gtk-version-paths.props" />\r
+    <Import Project="gtk-build-defines.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros">\r
     <DoGenGir>\r

diff --git a/build/win32/vs9/gtk-gengir.vsprops b/build/win32/vs9/gtk-gengir.vsprops
index ead20e00dbdee15842e31d238ac573a3d3b7de41..bc649a48a772cbb404004ce2f26da050a2bf1cda 100644 (file)
--- a/build/win32/vs9/gtk-gengir.vsprops
+++ b/build/win32/vs9/gtk-gengir.vsprops
@@ -3,7 +3,7 @@
        ProjectType="Visual C++"\r
        Version="8.00"\r
        Name="gtkinstallbinprops"\r
-       InheritedPropertySheets=".\gtk-version-paths.vsprops"\r
+       InheritedPropertySheets=".\gtk-version-paths.vsprops;.\gtk-build-defines.vsprops"\r
        >\r
        <UserMacro\r
                Name="DoGenGir"\r